reconciled fix of 1.x