Gcc fix
Potential workaround for #677