Shapebase fix for repairs

Expanded if check