Fixing bug detected by Luis