Fixing live bug