Fixes issue 63