one more intermediate commit to adapt to 0.9