Should fix #208