should fix #39