refixed bug