Mysticial Fix incomplete refactor.