fixes bug #582