Fixes issue 408