Added shim for GA fixes #2
build