emergency fix
lazy load bug