Fix according to comments