Fixed other bug