[#3024] Backporting syntax fix thanks to @issei-m