fixed create/remove goal