Issue 310

This should solve Issue #310.