fixing mapping issues