fix classes for flow loading bug