added manual hack to the scripts