Issue#299

closes #299