more bug fixing