Fixing Issue 79