Issue 330

This should solve Issue #330.