Temporarily switching to my fixed version