Final fixes #1141
Unwanted change