Issue #71: Fix some wrong cases.