Fix the other part of #18