Fixed performance issues for single proc