fixed same bug