Fixes issue