This needs to be done for javascript as well.