fixes bug #587