Fix init to more smart