Merge with Heather's fix