Issue322

fixes #322