fixed potential crash / endless loop