rifkin & schubert
merge fix