[BUGFIX] Reverted to support "eta" option