BZ-9741 Fixed presentation swapping issue