Fix compatibility with 4.00.1 (continued)