Patch from blade-runner. Fixes GINN-80