A better solution for Issue #101.