fixed bug with Golfs