Warning police: Removed catch-all case which was overlapped