Fix for missing id