fix for null access