PR for #263

As per #263, and discussions in #264