bug fixed in forward mapping