Fixed class instantiation