Temporary fix for wait time (by setting it to fixed value)