Fix for cc9b227979fa24ebb44bede72061a2d453834b46