Fix same bug