Fixed two merge errors
Merge pull request #1551 from gem/fixed-merge-errors

Fixed two merge errors