REFS:#255 Minor