forgot to commit shapeUtil mods