v.1.10.15: Fix 4.0 crash.

Signed-off-by: vjt7312 <vjt7312@gmail.com>