Fixed exotic operations handling