Quick hack to get JS message generation working properly again