Work-around for failing build