Fixed regression from 06bcf1128571048f25eb6b018358ee76d500e301