fixed goalrules
mergefix