Bug 941 correction

Bug 941 correction