Fix #7 and PR #8, where indicator does not align