hot fix for shapes