Fixed non OTR compilation