Fixed toast problem