Fixed 2 functions