Fix bug in #18