Updated to work with prior to 1.502 (1.485 and later).