Attempting to fix the source references