 * Fix OTP tag #2570 #2571