Implement Issue #463