PACK-22: Fixing bug