fixed Maxwell issues