Also addressed in d5b9f52