[FP] Bug fixing for publishing