#BUG:4496 -- part 2 fix

Signed-off-by: A V Minhaz <minhazav@gmail.com>