address PR2585 comments