Fixed possible deferral bug