the side-effects seem to have been fixed

(more testing necessary)