Little tweak related to old-style Mattock tasks
Adapting to Caliph