Fixes https://github.com/stayful/commons/pull/428