Hopefully fixed Issue #44