fixes issue 258