Remove dupe + fix bug with math