Updated to ubiquity 2.18.8 base