fix #196 for good