should fix #783