fixed issue 435
fixed issue 396,394,448,435
Merge pull request #449 from safiyu/audits

fixed issues 396,394,448,435