unfinished bug fixing