Update for 7.4.507 (Close #6)