Fix for name -> nil