Improves https://github.com/sintaxi/harp/issues/317