File&Dir issue fix