more bug fix
bug fixes