little leftover bit of #15