Fixing goal creation