Make it more safer (again).