Issue #245 work.
Hopefully fixed Issue #245.