EYETRACKER-137: Fix type checking logic