Bug fix #4400

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