Fix but an intresting bug created