bug refixed)