hacky but working fix for schema class application

This solution should resolve #442 # 424 #410