Fixed the issue Reported by Teena

Fixed the issue Reported by Teena