Fixed #519 for real, I think.