RainTpl 3 support fix