Unify behavior, thanks to Christian!