Fixes issue#1