Fixed after  Blain's code review