Temporary fix in the init part