Fixed issue #2199 on branch 3.0

Signed-off-by: Mohammad Ashour <ashour.mohammad@gmail.com>
Fixed issue #2199 on branch 3.0

Signed-off-by: Mohammad Ashour <ashour.mohammad@gmail.com>