Actually, this PR was issued before #2000 ,and at that time I wanted to make sure that nothing is broken.