Was causing issues