Bug 38 fix