Fixing Issue #315