fixed issues 396,394,448,435