Added check for matching source/dest to skip