Is this a mistake that needs to be fixed before this is merged?