is addressed in #801