Fixing bug #22