CRA-606: minor bugfix, and removed trailing white space in code.