Initialization queue fix