[Issue #186][WIP] fixed scenario