Check for default value first
Merge pull request #15 from sagikazarmark/fix/automatic-resolution

Check for default value first