Fixed this bug again, this time properly