Fixing bug #267.