@update - fix folder reference duplicate problem