These changes need to be made to the other languages that have recently been merged