Fix init, missing code bypass