Some more changes for the fix#0000