Merge pull request #1876 from luzpaz/saem

Add saem->same