wait 5s and improve workaround