Fixed timing. See previous comment