refs #5: there was a mistake on the merge