should fix #235