Do not rely on prepare task