Fix bug on merging sjsir and create second plugin