fix for bug500