Fix for #216