Fixing bug #151