#126 try to fix randomly ocuring exception