Issue 315

This should solve Issue #315.