fixed how fork mapping is handled