Changes to fix #410, #314

Fixes issues #314 (closed) and #410 (closed)

mentioned in issue #410 (closed)

+1

Please check this fix with #410 (closed)

@satish.dvnk Not sure I understand what you mean? I wrote this merge request to fix #410 (closed).

@satish.dvnk this is the same as #372 (closed). There is a merge request here which I wrote but it was not merged. Something else was done in two other commits because the first missed of an extra "?" (clearly not tested) and didn't include the other part either (around line 55). Both were already in this merge request...

This is duplication of effort and it makes it a total PITA to check if things are fixed or not.

Can I close this? @lord_alan

@satish.dvnk I guess so yes.

Status changed to closed