need to fix bug