oops, forgot an ampersand
merging from master