fixed bug
fixed ubg