Fixing the bug around toast being not shown