Trying to fix #644