Completes #1211.