fix enhancement #19