Fix bug 4635

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
ChangeLog entry

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