1.38: redone of previous fix, add() remains, addAll() produces alert about need to replace it and doesn't work more