Fix object instantiation