Fixing change path scenario problem