Safe ready for production
The Safe Bug fix