Fix for #72