Fix hardcoded return time