Fix #220 (Reported-by: Joseph Norton)

Fix #220. While at it, also fix a comment in the surrounding code.