#30 - fix some async loading