The Jakarta Administration is building fleets to service the TransJakarta busway system’s upcoming 24-hour schedule, planned to kick off in July, an official said on Monday.

Udar Pristono, the head of Jakarta’s Transportation Office, said the night shift of TransJakarta will be using the revamped buses from Corridor I.

“The fleets for the night TransJakarta will be from refurbished buses from Corridor I [Blok M to Kota route],” he said, as quoted by Indonesian news portal Kontan.co.id.

Pristono said the contracts of 90 buses from Corridor I would end in June and they would then be sent to mechanics for renovation. The corridor has new fleets, so sending the older buses to TransJakarta’s night service would not interfere with the regular schedule, Udar said.

“After they [the buses] are refurbished, the night shift of TransJakarta will start operating in the third quarter of this year,” he said.

Jakarta Deputy Governor Basuki Tjahaja Purnama previously said that increasing the TransJakarta service will accommodate people’s need for a safe public transportation at night.

“The idea came because many Jakartans go home from work at night. So when TransJakarta can fully operate for 24 hours, it could give a lot of benefit for the citizens,” he said, as quoted by Sindonews.com in February.

Basuki said night time public transportation options are still very limited in the city. The 24-hour TransJakarta service will help reduce the number of illegal minivans taking passengers at night, he said.

“Therefore the crime potential that is feared by the citizen could also be reduced,” he said.

The National Police in February acknowledged that there is a general sense of unease among the public about taking public transportation in Indonesia, but say it is up to transportation authorities to address the matter of security.

Brig. Gen. Boy Rafli Amar, a spokesman for the police, said that the recent death of a university student who jumped from a moving public minibus, or angkot, out of fear that the driver intended to rape her highlighted the negative public perception of public transportation.

Instances of rape and kidnappings aboard angkots have become increasingly common in Jakarta. At least eight women have been kidnapped or raped by angkot drivers in the Greater Jakarta region in the past year.