Fix the first part of #26.