Resolves https://github.com/balderdashy/skipper/issues/28