Issue #449