fix for commit 536d91262361e72e805f1148ffb1a51adc062929