Make code compatible with 5.3.10