Update from 1.1.x fix