Added in a helper, made it work back to at least 5.4.1