shameless promotion of a feature request to extend this for better re-useability and future prooofing.