Patch for TAP5-1476

[Taha Hafeez]

Hi

would really appreciate if somebody takes a look at the patch submitted by
me for

https://issues.apache.org/jira/browse/TAP5-1476

regards
Taha