Shelby, fixes #162