Quick fix for stop