uu, this should be handled in tests :)