bug and fix