Fixed #17, #18