Fixes issue #520 (hopes it ok this time)