Temporary workaround to fix build