[#785] Feedback from @Spabby