Getting closer to fixing Issue #17