Fix issue with Integer and empty values

Fixes #1, #3