mirroring dep fix from branch