fix handling of AFTER when no MaxWait specified