Issue 326

This should solve Issue #326.