Fixed #16, #19.