bug fix
speed up