Fix submission save