Drop a hack which allowed to make Unit an object