Layout compatability fix.