Added more robust zeropoint extraction.