Bug fix 4284

Signed-Off-By: A V Minhaz <minhazav@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
ChangeLog entry for fix of bug #4284

Signed-off-by: Marc Delisle <marc@infomarc.info>