fix from 1.0.11RC2