Fixing Issue#22