Added compatibility for fast downloading