Extending BugFix #4053

Signed-off-by: Umair Khan <omerjerk@gmail.com>
Merge pull request #925 from omerjerk/QA_4_1

Extending BugFix #4053