Reverted the changes which were missed in previous version