Fixed as per PR and then some