2046: Fixes issue