Fixed according to EranK code review