Fixed the slow running