Added pipeline hack