Minor change to make loading work correctly.