Fix #17, #18.