fixed wrong mapping