Returned to old version that works