Update code to fix a bug related to deferrable.