Issue 343

This should solve Issue #343.