fixing random bug
Merge branch 'master' into account