Fix for #2430.
Merge pull request #3183 from Segrain/master

ID cards bugfix.