modified change to fix bug