bug #504 fix