Fixed after code review