Resolved issue with performance