Issue 342

This should solve Issue #342.