[#4771] ticket:635 Fix bugs catched by tests
2 files changed