Better support for run button