should fix #41