Issue 309

This should solve Issue #309.