Patch against issue 1062