Fixed last changes to not break loading