Fix commissioning