Fixing bug #43