fix for the slow at the begining