should fix #32