Fixed direct loading from SQL