Previous issue was not fixed completely (functions fix)