Bug Fix : 1898 Replaces the previous commit : More fixes.