Issue #998