Issue#322

fixes #322