Correctly convert units and store block