bufixes to the loading