Enhancement for https://github.com/guitarrapc/valentia/issues/43