fix for performance issue