Implement #634 anyways, could be handy