Fix multiple rectangles per problem drawing