attempt to fix #645