Fixed issue with goals