Close Issue #541