Fixed toast issue