Fix safe entry manipulation