some bug fix
firs commit