Fix for #97 - backport from develop