Fixed issue when projecting into mapped types