Fix refactor fuck up