Fix OPs being built twice