Fixed variables being set before calling the setter method

Fixes issue #2077 (closed).

Re-upload of #2083, except moved into a forked branch. First time doing a pull request, so I didn't think to use a branch.