Hopefully fixed Issue #133