Fixed for the new preev api