Pipeline v1.0.6: Fixed circular criteria problem