edit, fix bug