more changes to fix bug