[FP] Bug squashing

It's working