Quickfix for failing build #21