performance-related bugfix