Fixes issue29