Stop work edit fix

@Listbd can you please review this?
Nice work!