No more total error.
With delete.
Merge branch 'revence27-master'