goal filling bug fix