Put back in plugin conditional check