Current weight bug fix