Increase consistency

Change-Id: I5469b00a533ef9bf731698d7906a470699e29ba6