Looking at this file for #1378