Another approach to rescue in order to fix #1156 because of POST upload
Merge fix