we can simplify this for now
version bump: v1.7.0