Fixed #119, which is really just about three issues in the same issue.