timeline resolution fix final