Fix for Shapes not being referred to in Util & misc EOL spaces