Fixed horizon (6/20)

Fixed horizon