Fix visual and collision on groovy-devel

This is groovy version of pull request #59