fixing conventions