As per discussion with jonnii on pull req #4