should fix #696