Jerry Moran, fixes #249