should fix #142