attempt to fix #774