FIX NULL ENTER