Resolve #34. The replacement worked quite well.