Jack Reed, fixes #506