bug fix
developing