Issue 358

This should solve Issue #358.