test & fix bug