begin to fix bug