Fixing bug #270