#4272 Contest-4

Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
Merge pull request #902 from vpowerrc/bug-#4272

#4272 Contest-4