Fixing not equals bugs