Bug #4300 Fix

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>