Fixing the ticket according to suggestions
Fixing the ticket-367 according to feedback