FIX raised during code review