Weird hack to work around task terminated.. can we please figure out a better way to solve this?