Bug fix 4284 

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