Fix for user defined command timeout