fixed stupid goal block bug
Merge branch 'ch'