Bugfix for extraneous assignment