Fix to make Bartek more happy