bugs fixed at FileSource