History and corrected zero-leading code when returning