Issue 340

This should solve Issue #340.