V2.5 - Fix for folder change issue