Issue 325

This should solve Issue #325.