BIG bugfix and uniformisation