Fix based on remote build