fs api changes fix