Fixing bug in goal add tool