resources mapping issues fixed