#5 Fix bug related to de-duping and async loading