fix initialization order and add proper (c)