Layout fix for multi buffering