fixed allocation conflicts