Possible fix to issue 19?

Not sure if this is the right solution but it does solve the problem for me.