OF-810 Added missing return statement + removed duplicate comment.