fixing same bug