fix issue #9
fix @rpkilby's OCD