Good hack waiting for update