Fixed for v5.4