Fix switch between old and new approach.