Bug Fix, without Toasts taken away.