Adding fix