Revert "Revert "Problem with last  commit/sync""

This reverts commit 875f84fadf04496aac254cd6640440d86f886fcd.
test