Fixes issue 36