Fix for gold template crash