More math fixing!