Senator Brian Schatz (D-HI) Fixes #87