Fix code due @stof comments