Fix for flax stuff