Fix bug in update process
Merging changes for version 1.8