Fixing and bug