As discussed offline, this should be added to the library if possible