Follow up #1669 in other langs