fix square ubiquity mask with workaround