Fixes issue 416