Temporary fix until taskw is sorted out