z21: fix for timed commands