Fix according the object calisthenics