removed v3 hack