fixed a problem with #19.1