Actually fixed merge to appease TJ