Fix Error #5 and #9