OPs + ABs fix