Fix addressing problem