Hopefully fixed #745