fix from 1.0.13RC2