Added fix for continues performing commands