Fix for #217