#787 Fix lazy methods to execute non-lazy methods in between.