Fix issue with 1.7.3