Fix paradox support