SONAR-5056 Fix issue on move up/down