bug fixes Archive