Issue 308

This should solve Issue #308.