Initial fix for command ordering in transaction