Fix for Bug 957.

Signed-off-by: Ravikumar Chiguruvada <ravikumar.chiguruvada@ericsson.com>
Change-Id: Ifa471d462f4800f553bb68d3ed7fe1cc71a17fcc