Fix #577 for other languages