Increase max number of devices to 32 from 16