Possible fix for JavaScript templates #2