Fix goal controller