Closed #9 bugs