Fix according to review