Update for backwards compatability (bug #1548)