bug born after merge fixes