cherry: issue #005