modification for #504