z21: fix for single gate