Fixed Toast problem