Fixes bug #11677