fixed toast error
saved work in progress