TODO: week resolution bug