#49 extra boundary check
#49 test fix