XXX: fix init properly