Fixed a zero padding error condition...again