WIP: experimental fix to wait for ajax