Workaround for defect #1239