Fix for NA object names