Fixed update from 2.10.9