fixes #800 - conditional incremental loading