minor change
specified behavior in case opt.w = 1
minor change