Fix for the new layout stuff.