[OTR] Fix for 979d7e0