Untested PR for #485. Unable to test because unable to build