Added a temporary hack to fix this bullshit.

Until we can figure out why GM sucks so much...