just some bug fixing