Fix error #18 and error #17