Feedback to patch 1.37 (?)