temporary bugfix for what appears to be multreading problems