Class initializer fix