(#1771) - Defer changes error