Fixing after Code review