Reid, fixes #205