Working around issue #19.