Amended in 3b33687