reflect changes made in 07a59d7 in code