Attempting to fix breaking build