Can you do a quick fix here so I can merge this independently?