we need to have this behavior at a lower level - for people that uses the API (see my previous comment)