CON-1016 | Better fix