Importing Temasek's fix