z21: binstate fix