Would you mind applying the changes you did in #78 here too and then close that one? We can ship them together as they are both needed to solve the issue #76
@sauloperez I apologize for the delay. Also being new to Github I am unable to add new changes to this PR. I am creating a new PR and will have the issue resolved in that.
Would you mind applying the changes you did in #78 here too and then close that one? We can ship them together as they are both needed to solve the issue #76