same bug more fix