SIT-2136: Trying different method