Fixed the non-lazy-loading handler