A careful reading of the code seems to indicate what you suggest will fix it