Applied patch from Fredric for Coral.