fixed model handler rules