Fix part of #4.