should fix #775