This patch fixes user's files corruption.  Also, I applied suggestions
about commit message, thanks zimoun!