Try to fix Issue #205..