Better check suggested in code review