fully restore 2.3.10 behaviour
Merge pull request #86 from kisoku/fix_update

fully restore 2.3.10 behaviour