Task retrieval fix