Fix #16 and #17.