Issue 329

This should solve Issue #329.