fix 07 and stop functionality