Fix per Aaron's repo