more bug fixing :(