Fix possible bug due to slow loading