fix some behaviours