apply fix from 0.9-12 branch