merge changes to fix bug