Fixes issue no 37