Make Gstatus toggle more robust