Fix for #171