Fix stackoverflow with messages