Adding missing geometry check.