Oops, accidentally cut off the last few words.

Coincidentally it's back to working in the first case I described. Adding stops is still broken:/