Fix double linking of gimmicks