Addressed commit of PR2