[Issue #359][WIP] added checks
[Issue #359][WIP] fixed scenario