BugFix #4305

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

BugFix #4305