VID-1347 switching position 1 and 2 for more code clarity