Fixed issue 7653

@hargup please review. Fixes #7653