Fix for stops with a slash in them