Bug fix 4284

Signed-Off-By: A V Minhaz <minhazav@gmail.com>