Fixed #18, #19.