should fix #223