fixsing some bug