Is this something that needs to be fixed before this PR gets merged?