Fixes issue 28