Fix match statement for &self