Fix for failed test on 1.509