#487: change rules