M: Sometimes ::stop more fixes, stupid mistake:-(