bug fixed, tentatively