addressed in 6c832e2