#423: code review (oops)