I feel like two resolutions were broken here