Fix bug with underlay calling wrong hook file