#CRA-709, #CRA-716

Test cases 2 and 5