Added check for geometry