Merge pull request #1259 from jpereira/fix/realm1