Fix for #208