Right, dirty fix but should work on gcc now.