Safe closure version