Bug fix for #64 and #65

Sorry, last pull request did not fix a new bug when dereference list filed, this may work