Another v1.1 fix