fixed refs to str and unicode