Missing part of #715