some bug correction