Improved contention handling