FIX mismerge from 3.4.8