fix as suggested on first code review