Toast Fix 2 bugs