Fix for pre-render scenario
1.3.8