Fix for initialize-instance not returning the class