v5.8.21 - finish #20 by hackfixing leaves