Follow #1615 in other langs