Added #18 and #19.