Fix regression.
Merge pull request #815 from tobeytailor/gfx

Fixes regression in #811