In its latest update on the Heartbleed bug, the Canada Revenue Agency (CRA) says that it is still expecting to restore service over the weekend.

The CRA reports that it is making “good progress” in its efforts to patch over the Internet security vulnerability that was discovered earlier this week, which caused the agency to suspend public access to its site. “We continue to anticipate a resumption of our e-services over the weekend,” it says.

Earlier today, the federal government’s chief information officer issued a directive to all federal government departments ordering them to immediately disable public websites that may be vulnerable to the bug by virtue of unpatched encryption software.

The CRA has had its public access suspended for several days now, but it has committed to extending the tax filing deadline by the same number of days as the service disruption.