Issue 381

This should solve Issue #381.