LQ : For fixing Bug-1. Missed code in local and server.