Resolved peformance issues for problem 60