Add old behaviour back