Fix for #219