hopefully last bugfix for this problem :)