Fixed crash by removing redunant link and helper