goal bugfix