Modeler fixs