fix issue 35

This solves my problem, but is not a perfect fix since it does not preserve default values that are null. 
Ideally I would probably instead revert the changes made in to make it more consistent:
https://github.com/kenegozi/Core/commit/f86cbaf3e04b520710c9e2aef88def868e6011ea