Complete the fix for #171