add and fix bug