Fixed a bug in 3b3ed0c with --lazy-load