Repaired 20180117 095709

And