Fix weight calculator