should fix #47