Fixed Basic Components loading crashes