fixes bug #9487