update and fix for 1.7.2