Issue #452