v1.7.2 Fix a bug introduced with previous commit