Improve previous fix to use an initialized variable for more predictable
and correct results!