Fix https://github.com/jessepollak/card/issues/26

This fixes both problems within the issue.