Add some extra cases