SEC-1545: fixed unboud variable error

PLEASE REVIEW
No Pep8 ran. 
@jsakai