Issue 396

This should solve Issue #396.