fix mapping issues