bug fixing, again