Probably fixed Issue #7.