[930] Fixes chattiness