Fixing Bug 1851, 1852, 1854