Fix default trigger and use diamond inference