Fix for #221