Fixed circular mapping issues