Fixed issue #9406: Unable to save survey