will better match the current behavior