Destructive bug fixed