Internal Preview fix