We want to do this and avoid the behavior described in #68
We want to do this and avoid the behavior described in #68